Don't put vide in .setup.init section

Also, it's safer to test for the case where param > __setup_end due to
some mysterious misalignment.

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 9692d6712d2c2b99d25bdf116b6c9995790133e1..3852bea9bc5de0bf6b8136e797026f7accb598ee 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -39,7 +39,7 @@ custom_param("amd_flush_filter", flush_filter);
  */
  
 extern void vide(void);
-__asm__(".align 4\nvide: ret");
+__asm__(".text\n.align 4\nvide: ret");
 
 static void __init init_amd(struct cpuinfo_x86 *c)
 {

diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index a2a0184e75327bd71d859d0f635986195fac068e..d8af717b62394121227d731ab15982dcd08f064a 100644 (file)
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -46,7 +46,7 @@ void cmdline_parse(char *cmdline)
         if ( optval != NULL )
             *optval++ = '\0';
 
-        for ( param = &__setup_start; param != &__setup_end; param++ )
+        for ( param = &__setup_start; param <= &__setup_end; param++ )
         {
             if ( strcmp(param->name, opt ) != 0 )
                 continue;